testsuite: Disable vulkan tests when vulkan isn't available
authorTimm Bäder <mail@baedert.org>
Sun, 22 Oct 2017 14:58:53 +0000 (16:58 +0200)
committerTimm Bäder <mail@baedert.org>
Mon, 23 Oct 2017 06:02:57 +0000 (08:02 +0200)
They are always going to fail in that case anyway.

testsuite/gsk/meson.build

index 1bba9332f842b182cef5b48eb383cf40fe8b9cc6..61c2a04a3d7cbd029478f9722f1a03703a1f0185 100644 (file)
@@ -22,25 +22,27 @@ test('nodes (cairo)', test_render_nodes,
           ],
      suite: 'gsk')
 
-vulkan_test_env = environment()
-vulkan_test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
-vulkan_test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
-vulkan_test_env.set('GSETTINGS_BACKEND', 'memory')
-vulkan_test_env.set('GTK_CSD', '1')
-vulkan_test_env.set('G_ENABLE_DIAGNOSTIC', '0')
-vulkan_test_env.set('GSK_RENDERER', 'vulkan')
+if have_vulkan
+  vulkan_test_env = environment()
+  vulkan_test_env.set('G_TEST_SRCDIR', meson.current_source_dir())
+  vulkan_test_env.set('G_TEST_BUILDDIR', meson.current_build_dir())
+  vulkan_test_env.set('GSETTINGS_BACKEND', 'memory')
+  vulkan_test_env.set('GTK_CSD', '1')
+  vulkan_test_env.set('G_ENABLE_DIAGNOSTIC', '0')
+  vulkan_test_env.set('GSK_RENDERER', 'vulkan')
 
-test('nodes (vulkan)', test_render_nodes,
-     args: [ '--tap', '-k' ],
-     env: [ 'GIO_USE_VOLUME_MONITOR=unix',
-            'GSETTINGS_BACKEND=memory',
-            'GTK_CSD=1',
-            'G_ENABLE_DIAGNOSTIC=0',
-            'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
-            'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
-            'GSK_RENDERER=vulkan'
-          ],
-     suite: 'gsk')
+  test('nodes (vulkan)', test_render_nodes,
+       args: [ '--tap', '-k' ],
+       env: [ 'GIO_USE_VOLUME_MONITOR=unix',
+              'GSETTINGS_BACKEND=memory',
+              'GTK_CSD=1',
+              'G_ENABLE_DIAGNOSTIC=0',
+              'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()),
+              'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
+              'GSK_RENDERER=vulkan'
+            ],
+       suite: 'gsk')
+endif
 
 test_data = [
   'blendmode.node',